Backout a69d60d90110 (bug 772119) for bustage