Backed out changeset 8fbd24c57aea (bug 947550) for robocop failures.