Revert #13855 due to #14263

Refs #13855 #14263