We switched to PHPDataSets already but didn't migrate all usages. This commit now migrates all usages left behind.