Revert "Merge branch 'adhawk'". Incorrect modifications.

This reverts commit 725c88846e8a0cbf1448120e358643c7a9e19b4f, reversing
changes made to f175be08763fbe700ed3e106494cd15ec3cb658d.