Back to 2.3.0 because of a regression issue