Reintroduce save hooks