Revert part of previous vc-bzr change