Revert "merge from THLG"

This reverts commit 56cf9168890db411c5a8e7e65d361c22e9547d3b.