Revert "Merge pull request #396 from pwieczorkiewicz/nanny-reset"

Error with disarmed nanny has been spotted by Test Suite.

This reverts commit a6727d3607c4f4261fc4144f6ba2e795ec6b4f0c, reversing
changes made to ae66a99cc67b38113019a329c4257fcffba71597.