Back out 353f5b3c81c7:62a1a184b2c3 (Bug 869723 and Bug 870090) for not actually building
CLOSED TREE