Backed out changeset 3761b11b90f0 (bug 970247) for robocop NPEs (again).
CLOSED TREE