This reverts commit 4210eb1d. I didn't realise this was going to break every -Werror bot, so I guess we'll take the test suite failure until a fix is found, it's less disruptive.
