Revert "new upstream version" to allow for clean merge from Bart Verwilst

This reverts commit 5965f9d52761bd4fb7d53c10a6118ea3279bdc85.