Revert commit 101503 (johannes), in the hope of fixing the dragonegg build,