As discussed on IRC, I don't think we need the esxi bit.