This reverts commit 2ada8e25. Buildbots produced compilation errors which I was not able to quickly reproduce locally. Need more time to investigate.
