Revert "Merge branch 'sh-allow-storage-specific-objectstore-disable' into 'master'"

This reverts !52750 (merged) because it breaks consolidated object storage settings since object storage is disabled for every artifact by default.

Will have to revisit how to fix this problem.