Backed out changesets f9f13232e35f and 134b4feaff02 (bug 888583) for bustage.