Merge pull request #2908 from solgenomics/topic/revert_login_ids