Backout changeset 73a55e607a3a / bug 522886 due to unit test breakage, and incomplete patch CLOSED TREE