Back out changeset 0d285589f47a (Bug 839673) - Broken Merge