Reverting some setting changes
Removing expection wrongly added