Backout aa955afe7507:49f1c6fa27f8 (bug 953381) for robocop orange on this CLOSED TREE