Argh, missed the old comment.  Because I've prepared and tested the PR for 3.5.x already, need @vohi decision if I should spend time reworking it to remove this comment or only patch it in master.