It's probably possible, I'm working on cherry-picking this into another branch to test against v1.2.x right now, so I can try to make it work there