Backout changeset be729bc526a3 (part of bug 864035)