Revert 514acdd..aad52c5

This rolls back to commit 514acdd7a4b6ad9f4113cb457a86204a8fd21306.
change settings