Backed out changeset 1d41c64ab235 (bug 860326) for robocop crashes.