This reverts commit 2307d7df. After some more discussion with upstream, we've come up with much much better way to deal with this.