Needs to wait for https://github.com/idaholab/moose/pull/10238
This will create a new commit in order to revert the existing changes.