Revert "Merge branch 'sh-fix-delivery-job-deprecation' into 'master'"

This breaks migration specs that were not run in !36669 (merged) and should fix #228876 (comment 379186731).