Hopefully, check-in [33a2920cbe8260ad] on trunk will address this issue.