Revert "Updated to work with the latest version of TFM."

This reverts commit 304a6cc38fdcf6c4dea81e10bba5166cd147476d.