Refs #8449 Revert changes

It's too late in the day to fix the build server errors