Backed out changeset 03bf10b236ea (bug 970247) for robocop NPEs.
CLOSED TREE