FWIW I've committed the v2 fix (I liked it more), and I've backpatchedit to 18.
regards
-- Tomas Vondra