This reverts commit 6cfff42b. After 2e47a6e5dbd034ee7f7a2662d6d7293326d1db8e it appears not to be necessary.