Back out 757e87bb1c1e:2c2bb15bf160 (bug 884676) for make check failures
CLOSED TREE