Revert "Remove unused helper methods"

This reverts commit da806eebb7a8895b49247a0402c114f3812c409a.