LPS-32582 Keep old logic for default schemes