Backed out changeset 80bf024e03d6 (bug 1054920) for robocop-5 and S4 orange