Chris merged CFBE into the trunk, which fixes this bug.
