Clean up #4858
Merge pull request #4862 from cvrebert/patch-1

Clean up #4858