Revert "merge MT changes"

This reverts commit 4e4f25e80c1596dfe0f5aa44b2619e449bf6035f.