Revert 625c84a..a7039d7

This rolls back to commit 625c84a3f4144110b03388707c38e85bd09f4e6a.
last commit for today