Revert the rsrc_id change and use instead specific matrix_defs.