Revert "merge revision(s) r45676,r45677: [Backport #9769]"

This reverts commit 39b896c376549b7d1357eaa4a2900dc4e7b47195.

Currently breaks on GitHub, see https://bugs.ruby-lang.org/issues/10285

Conflicts:
	ChangeLog
	version.h