this is what I should have done in !63589 (merged)
https://sourceware.org/bugzilla/show_bug.cgi?id=30824