[BUGFIX] Follow-up clean up to #24389

Change-Id: I2b5438edd23650fd63b1771c9d6a825ae1aaa210
Related: #24389
Releases: 6.1
Reviewed-on: https://review.typo3.org/18100
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn