Revert "Version31"

This reverts commit a13449d4883c3f2144f2fa46fc8637001c2f8cda.