Back out a615811b12e4 (bug 888109) for not actually building