Revert "Merge branch 'ci/prepare_jbm_neutral_delay_test_for_basop' into 'main'"