Back out 8396d7543197 (bug 857645) for build bustage
CLOSED TREE