Merge "Revert "Adding e4crypt support""