Reenable checks that were accidentally committed when renaming RecordEntity
In light of your comment in the other thread, I have created this MR to fix the problem i introduced when renaming RecordEntity because the import MR will take longer to resolve.