Backed out changeset 705b1be87804 (bug 1098667) that was not intended to be pushed.