Back out 9fe5610363b3 (bug 959652) for bustage