Rolled back Joern's changes. They've been moved to another branch, and will be merged...