Created by: cvrebert
This should finally get the v4 Travis build to start passing! Closes #17272. Fixes #17097 (closed).