Unbreak after the collections reform