backout d459cc1b5a94 for robocop failures (bug 912243)