Revert "201402 upgrade merge + versioning"

This reverts commit ce9e39d935ce1b2132f160a140c3cd3627e36fa9.