Add temporary MCP/Forge hotfix as suggested by cpw.