Revert "Fix encryption request handling"