Revert attempted keyhunt fix