This reverts commit c1de65fecf1823376e4ef0524d839b49a87aabd1. bzr revid: ced-21acfa4265f4078669f23f306886449cc78877c0