I recently ran into this with armagetronad. I've now confirmed that reverting
these changes fixes that as well, thanks Dave for saving me the time to track
this down!

Ville, any ideas what's going on / how to fix it? If not, please revert these
changes.