Remove workarounds from issue #4404

Closes #10875