- Re-add GH-1286 fix for portals