Polishing changes from #PR #2781

Looks like an unnecessary commit was made by the author just as I was clicking the Merge button. :)