Reverted hostname override change; fixed issue with existing empty nodes