Backout dcc265385f91 / bug 528044 due to possible bustage