Merge "Revert "Default host module tag to optional.""