Revert "branch 2.3.x from master at v2.2.0-242-ge85cdda"

This reverts commit 9e66317af1de3ebe8205aaefebf42514ddf82f32.