Revert "Reworked submission using pre_save and post_save"

This reverts commit afdc5e208b385060fb37153467a10002943b6e90.