Revert "fix 4413"

This reverts commit eceb7fa13645a2e701e6421663ae456783b94dff.

caused unit jittering / many NP=0