Revert "2.3"

This reverts commit 12158920136016b250f2a3a70449a71e49811c36.