Workaround for https://bugs.launchpad.net/bzr/+bug/888615