Follow-follow-up fix for "hw: basic support..."