So annoying this hasn't been using template1 as per the defaults. I think though the side-effects might be enough to warrant that this only happens in a major release. Shame really.