Revert "Merge branch '34689-prefer-dataset' into 'master'"

This reverts merge request !86576 (merged) because it is causing QA tests to fail on Chrome 91: #362178 (closed)

https://caniuse.com/?search=hasOwn shows Chrome 91 doesn't support this. Let's regroup and decide if this is what we want.