Revert "v2.3.1"

This reverts commit 53d8fff0d7057aaacc9fad986ba6993a41797384.