After commit cbf3ef0f219a7d5c94a7f5d5b46c9a0e26cc6588 this no longer
necessary.

This reverts commit 9a4bb50a.