Backed out changeset 3986e809158a (bug 903291) for Gu bustage