Backout changeset 13c5e7a669b6 / Bug 871266 due to test failures CLOSED TREE