Backed out changeset 14a43400007e (bug 859683) for robocop failures.