Revert ">>>>thlg"

This reverts commit 0e2de9e9fc72c6832c2ae381a59ff01344abb34d.