This reverts commit bdfb7604.

Now that d3cold is upstream, there is no more need for this workaround.