Backed out changeset 756a66aa8ee7 (bug 1033618) for bustage.