Make phase 1 "save and exit" button actually save before exiting
Revert "Fixes 500 on non-dirty submit in phase 2"

This reverts commit ba2b0053de67719b2fb4839ecd6f34321b61fac1.
Make phase 2 "save and exit" do a simple GET if non-dirty