Remove unnecessary workaround.

Closes #9854.