Revert "Use a signal handler instead of patching save."

This reverts commit 3496fe42916696db36d799facfbf56f9caaa5035.