Upgrade to use bit 0.8.5