Revert back to basename