Don't dynamically define $container

Change-Id: Ib17b12c8c60460930085ee082590c6ae30c52016
(cherry picked from commit 4055755d6ca6e6da867dee6adf098435c8fba922)