Revert a186918..b179679

This rolls back to commit a186918e7814f752ec8a19aa217b181d799773be.
Revert b179679..7c96c42

This rolls back to commit b179679fb96d1797d87d14b517e37e2396cc914e.
NOT WORKING - Work in progress