Reverted to the old code and removed all of the backwards methods.
Workspace? Commit.