Revert 26af94c..9c58b4d

This rolls back to commit 26af94ca1db0b44a482823a71cbfe697df7cbb0b.
Added user settings