Reverted DxHooking change TODO: implement full solution
Finish Hotfix-2.1.0