This reverts commit 4cae6228d1. Breaks GCC build: http://lab.llvm.org:8011/#/builders/8/builds/33/steps/6/logs/stdio
4cae6228d1