Revert "Fixes for double tc"

This reverts commit bac46ad5aa34c5aaf84cc5aece548f5db92b0723.
Fix memory mode assertion failure