Done: https://www.mediawiki.org/w/index.php?title=User%3APPelberg_%28WMF%29%2Fsandbox&type=revision&diff=3966408&oldid=3966224