Backout changes from Firefox 33.0b2 updates builder (again, didn't clean up enough)