More changes to see if CloudFoundry might accept this.