I didn't author this patch, just committing it. See below.

Co-authored-by: Patrick Wildt <patrick@blueri.se>