It's come to my attention that people don't read diff emails so here's your explicit notification that there is a rewrite diff up for landing in 5.18 https://phabricator.kde.org/D27061