As you already did the work, might as well use it. Feel free to open a new PR. #1620

As you already did the work, might as well use it. Feel free to open a new PR.

Thanks

Originally posted by @waylan in #1618 (comment)