Merge "Revert "Add host support""