Rather than having a one-off hack for "blessed" containers, we should solve the issue properly. As that would take a bit more work, reverting to the previous state is preferred. Better that we solve a problem problem than with a hack that we'll need to roll back in the future. Refs #1220 [ci skip]