This reverts commit efdcf948. After discussion on the mailing list it was felt these changes were not ready yet.