Revert "Modifications for 0.40 release"

This reverts commit bd8df8fd5d5ce26ab349fbb172c2c9b94f485ee1.

Revert the last commit