Followup to both #444246 and #442996. This adds the patch that applies the same fix for clang based builds.