Fixed in [95d194f97f]

We work around TAO bug.