Revert "Merge branch 'fix/debug_sequential_2p_models_for_bcleverett_and_mcwhorter' into 'master'"

This reverts merge request !2608 (merged). Still needs fixing, see #1034 (closed). To return the master into a sane state we revert this until it's properly fixed.