Backed out changeset 9e43ff213b64 (bug 616491) for bustage