Back out e9ca04f323d0 (bug 928806) on suspicion of causing ASan and Linux debug gtest crashes
CLOSED TREE