Update #10160 simplified .make-container and removed mixin not meant for production