Backed out changeset 387c7e65c6ef (bug 979512) for Gu bustage.