In SERVER-61038 the patchwork was introduced with a goal of dropping __system connections when they become invalid. The code is suboptimal as far as read-ability because it introduces another edge case, where none should exist. We decided to merge that patch as-is, but refactor the authorization code before 6.0 to make it straightforward