Revert 13aa435..5c8b801

This rolls back to commit 13aa435d2188bcdea790a2714da71c35f1c6731b.
A lot of changes