This reverts commit c2b748e793. Revert back this change. It seems to not be an edge-case anymore since multiple users have asked about this new behaviour now.
c2b748e793