Reverted setting changes commited by @drunkrocketeer