Had to do a hands-on backport, figured we better get it reviewed, since it's the LTS branch. Ref !102 (merged)