Back out 5d5425acf620 (bug 1059600) for bc1 bustage
CLOSED TREE