Fixed possible issues with the crypto reported by an anonymous person.
Removed code that didn't work.
Merge remote-tracking branch 'irungentoo/master'