Revert "Fix to mode switching"

This reverts commit 3e27ff64473a844e26598286de3619b9b4842db7.

Reverted again to get rid of ds_store (OS X file in every folder)