Backout changeset 28aab9d91f12 (Bug 916071)