Follow-up to keeping os_base named as is.