yeah upon further examination the PR as-is doesn't work for CML-U. See dt-zero's comment on 2019-12-18
Fill in the blank.