Merge "Revert "Avoid marking ephemeral users for removal if they haven't been logged in"" into main