Backed out changeset 7c27af05042e (bug 929506) because it should've been backed out with f08ab0578efb on a CLOSED TREE