Backed out changeset a6acebd9c9d5 (bug 805591) because of build failures
Backed out changeset 1024e72d4ef9 (bug 826146) because of test failures