Backout 119c60543071 (bug 751156) for robocop failures