The original patch for #46604 unfortunately broke two (non-critical)
unit tests, which are fixed again by this commit.
Change-Id: I36d2cc62cc6cc744cd482aad573db57a57f832a8
Related: #46604
Releases: 6.1
Reviewed-on: https://review.typo3.org/19243
Reviewed-by: Andreas Wolf
Tested-by: Andreas Wolf