Backed out changeset 56423bbe9a13 (bug 891695) because it didn't un-bust itself automagically.