Back out cd8481cc4a32 (bug 784812) for make check failures