Revert "revert 'hack'"

This reverts commit fc9460952d5e12221105e4ebac56c85cd38d546e.