Backed out changeset 89a91619a2ae (bug 984101) for bustage