the last remnants of CLOUDSTACK-427