Fixed #21587 -- deprecation warning for upcoming permanent default