This reverts commit c19f2c77. Broke the gcc-7 bot.
mentioned in commit 378c9e95
mentioned in commit fc8775e2