Back out 0740fc10483c (bug 1072469) for robo* bustage
CLOSED TREE