revert bad keymanager fix