Remove monkey patches and instead depend on forked vcloud-tools