Revert shell_is_x changes.