Revert selection to support Return again