Revert "Nightmare governor: a little enhancement!"

This reverts commit ab45fe027e29aff43816a50fac0e4e41cdaa28ea.