Revert "selftest: Avoid being run over by armies of the undead"