Revert 7cdda59..a06cb77

This rolls back to commit 7cdda5933fe1e7ffd62fe7ecf27d48dc859ac608.
Now I will say no more dev!!!!