Revert "2.0 stable"

This reverts commit 8158702a7d076470507c2e101f139ec8837125a6.