Closes: #10085 (closed), #15010 (closed)
Refs #17999 (closed)
This will create a new commit in order to revert the existing changes.
