Comment 2 for bug 301472

This has been QA'ed according to the discussion on the dev list a while ago. The only thing I haven't tested properly yet is loggerhead, which appears to be down at the moment.

I'll keep it on just staging for a bit longer to see if we run into anything and will then land it on devel.