Revert unneeded newArrayList() use