Thanks for sharing your workaround!
You might also be interested in casting a vote on the following feature request: