This reverts commit cabd577460. There are additional usages of these tables which need to be removed first.
cabd577460