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