Revert 0c8a8fc..69bab6e

This rolls back to commit 0c8a8fc9a8380e9425dc92c11b01b50408a4d88c.
First working version