This reverts commit d1762fc454. Reverting D124232 as the buildbot reported some errors in sanitizers.
d1762fc454