Suggested by Futoshi Miyamori/JH1AFN <futoshi@sramhb.sra.co.jp>. I attempted to send this to cgd instead of committing it myself, but he wasn't reachable.