Reverted http://forge.typo3.org/issues/44535 due to errors