Revert "remove helper"

This reverts commit 630d438f8246a703a78afd90a6fdb1b53ff11aba.