Revert changes that I accidentally pushed on top of PR #4756.