Fix for EUCA-5717 which disables zero conf