r31 Revert "r30 Release 3.0.0"

This reverts commit 54dfafeee69bc23d76d00b46d9b21623039e0675.