Change away from unlocker stub