Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"

This reverts commit c5451777b038c5e48567f69256986ae42a2cde48.

Conflicts:
	activerecord/CHANGELOG.md