This reverts commit b07bb2e9.

The patch is replaced by a better solution.
Revert is only done for master, backport was
not done yet.

Change-Id: Ibcabb095e0043dd21cd694142d93baea7dc8e8c5
Reverts: #80459
Releases: master
Reviewed-on: https://review.typo3.org/52176


Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>