Nevermind, found the KB myself. It would appear though this only "fixes" the templates once they are imported into your catalog and doesn't actually fix the problem from happening again. I will also be opening an SR to get the fix since this is pretty wide-spread for us.
KB: