This reverts commit bdfb760400. Now that d3cold is upstream, there is no more need for this workaround.
bdfb760400