I'm facing the exact same problem. Has there been any progress on this? The proposed solution seems really painful.