Revert $this

This reverts commits bc9ba84b6b555e6ca1f690e7a9cbeb20b42517cc and
aadd5c36e6dfae038bd0aefab0d539d7d7431ac0.