Backed out changeset 8fd0df8e208c (bug 423758) for bustage