Reverting p_b_s changes that proved ultimately unnecessary