Back out e64522db8661 (bug 863288) for robocop-1 hangs