Backed out changesets 55f248b19a5a and 79303d2634e5 (bug 987641) for bustage.