Revert "Updated for release 2.1"

This reverts commit 955cab639d56fd8c5f88e0d402058404154dbf4a.