Revert "4.0 Final"

This reverts commit df68d56f27cbedfd2d4a1a1c968e4279a494391b.