Remove shim in favor of the real McCoy

Closes #3566812

Merge request reports

Loading