I don't actually need this anymore since we're going with a unit based approach for the containers stuff internally so let's just revert it. Fixes #34085 This reverts commit ce2291730d.
ce2291730d