Backed out changesets d901d33dd142 and 48da1752622f (bug 729463) for robocop failures.