these changes are required for cloudfoundry/vcap-common@d844955