This reverts commit b8d7dae4.

There was a reason for the removal of this hack. I introduced that hack while trying to fix that precise compile error, and decided that this fix was hiding a bigger problem. Would be nice to summon before reverting, that could prevent such mistake.