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