Revert "removing save hooks for emergency"

This reverts commit 6d0cd5080aea748dad5557267df1c137b1c4a118.