Backed out changeset 08185bc7ab8d (bug 885979)