Even still, users don't have that toggle so I fear this should be fixed (if at all) differently.