Return to using os_base without rename.