This reverts commit b861b122. This reverts commit 4be17641. This patch wont build on some compilers on buildbot.