Revert "Remove old style facia containers (Part 1 of 3)"
Merge pull request #6839 from guardian/revert-6810-kill-old-containers

Revert "Remove old style facia containers (Part 1 of 3)"