Backed out changeset 73c4111cab17 (bug 1083361) for bustage