Get rid of temp backdoor ContanerBuilder hack