Backed out changeset 1bb1e5ed3272 (bug 1030743)
Backed out changeset a9f445169eca (bug 1030738)
Backed out changeset fd8d40d26de8 (bug 1025931) for robocop-1 failures