Revert r178273 as it broke the Linux bootstrap due to false positives