Backed out changesets 59c761f6c0eb and 132f861349a2 (bug 1075531) for robocop bustage.

--HG--
extra : rebase_source : 42a8692d1d5e23f155aa9250a5f5a4fa9e4f9cba