revert b17ef7f93880 (couldn't figure out better fix for the new PSTN bug), fix annoyance with clicking on save comments changing pages