Adapt to Rackspace (still works on HP) -- fix