Please mark this with the bug# so that it's clear when it should be reverted. Though it looks like Walter has a pull which fixes the `%=` problem already, so I don't know that we want to make commits which get rid of `%=`.