Revert "Updated for 2.0"

This reverts commit 8de1ff7d8e3731f9f5ead113a7d88c31956adf6f.