This reverts commit e5c3828aeed61a6210eaef7d43062067cca6a47d. bzr revid: ced-a06d0abef258d22c7c2f249d267b7c638f196868