I'm in the same situation. Do you mind sharing the workaround you found?