Back out 80bfcf2d28c7 (bug 933384) and f2757e7d1a08 (bug 932215) for bustage
CLOSED TREE