I believe this is still needed when not using the collection helper. Will examine if we can remove it, if we can't I'll add a failing test case.