Fix to use the correct branch of plone.subrequest