Fixing up the mess after merging three PRs for the release (step 1)

This reverts commit 92dd95a635089282b190f29593a94e4d4c902224.
Fixing up the mess after merging three PRs for the release (step 2)

This reverts commit 654e4a3cb464aff4f7eb3b36fbaa9a02a3a08c53.
Fixing up the mess after merging three PRs for the release (step 3)

This reverts commit 66334d6b3cba9f7132a5a067a13ccf845d089c9d, reversing
changes made to 1227ffec26a76329d0d863342e0e6770be45d4cd.