Revert "Merge pull request #35 from cvpcs/2.0"

This reverts commit 58e70fb000d0d864bc327b71b19c057627aaebe3, reversing
changes made to 26c014d43ff21a3bf46216416edd56b3f8ae1aa9.