Apply patch from @petschki's which fixes #12440

I reopened the ticket https://dev.plone.org/ticket/12440 from @petschki because i could reproduce in 4.3rc1.