This reverts commit 1689b109. This patch was only added to fix a failure with 32b73bc6, which has been reverted again.