This patch has not been reviewed and was commited by accident. This reverts commit 788a5d4afe.
788a5d4afe