That sounds right. If you can, send your source to
support@crosstheroadelectronics.com with your workaround commented out.
Don't worry about it being "not pretty", just leave it as is.
At least that way we can get the root-cause nailed down and better help other teams.