The patch shown above turns out to work.
Fixed by check-in