Revert "update from THLG"

This reverts commit a2c86e2a061a47bd335195c50f0b131442cf29fc.