Revert "Remove hack"

This reverts commit 8aa0550a1fd835f8d8419af3957b8768a2939e34.