Backed out changesets bb54e487c53e and 882b5ddfc023 (bug 730941) for robocop failures.