Revert "update to 2.3 M1"

This reverts commit ec6973e267a45a82c006311989f6644e162e0910.