Revert all failed tries to get back and begin on 2.0 for good

This reverts commit 8327d2e6cb6e60ff2b88955c86f279714a7e471c.