Back out 6b890e8b931d (bug 872543) for robocop bustage