Products.Collage broken on Plone 4.3.6

I have a site which uses Products.Collage. Since upgrading to Plone 4.3.6 the collage no longer renders properly.
So far I haven't found an acceptable work around.

The issue is detailed here:

I figured out a workaround:

Use portal_view_customizations to edit the collage_view and replace:

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
      lang="en"
      metal:use-macro="context/@@standard_macros/page"
      i18n:domain="collage">

with:

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
     lang="en"
     metal:use-macro="context/main_template/macros/master"
     i18n:domain="collage">