Backed out changeset 3cd24f004c1a (bug 1068411) for robocop NPEs.