Revert 8b369ae0d68eac3401b26661b189dbc58ee0c3e4

The helper function makes it hard to track coverage and
generate good documentation