Revert "It looks like pbuf_free tries to re-enter critical section from within pbuf_cleanup, causing deadlock.  The offending commit is 2 years old, however.  Seems like it would have been detected... :-/"

This reverts commit b73c0c6e81f92bf8430f1cd07c1c21a211e97fc0.
Turn on encryption by default