Revert "Fixed issues recently introduced in primitive collections tables"

This reverts commit 269fd6ce13bc6899e4f09b82cfcf7c245fb129f0.
Revert "Merge branch '2.1-maint'"

This reverts commit 2b50d540c795d44f0c80126a913e9a9fccd895ec, reversing
changes made to fae8655a795bbe93214f316ebcf5374ed65a28c8.