Minor revert, no need for a generic list