This reverts commit 6b1c5775d1. There are reports of errors with this change. Reported by: antoine
6b1c5775d1