Back out 472aca16cb45 (bug 855847) for being necessary but not sufficient
Back out 88db24de216c (bug 855847) for not actually successfully compiling
CLOSED TREE