Backed out changeset 83714ee6b2bb (bug 988053) for fix bustage