Revert 3935a4b..7aad747

This rolls back to commit 3935a4b85ec86a6bc365901972322d48d64712bc.
It builds again!