Backed out changeset fcd1191c12b5 (Bug 996850)