Revert "Using salt as switch to enable or disable folder encryption"

This reverts commit 90f8d98e4b3573b46e1539388925a52de9cfba04.