Revert "Gearing up for a 2.0 update"

This reverts commit 1e360c14a683db837d52407e6e6ba6921cbdf8cc.