Trying to solve 12065

See https://dev.plone.org/ticket/12065