Revert "Merged h3h3's fix"

This reverts commit 63cf2e7fa116b154bad55130ad91b1408c12f4ac.