Revert 9d74ee1..5ff1112

This rolls back to commit 9d74ee123184daf6ad4171be955ee33af7e17aee.
Cleaned up