Back out 29230c04b932 (Bug 846670) because of broken Linux builds on a CLOSED TREE