Ensure that the init layer is removed with the container
Merge pull request #3020 from crosbymichael/remove-init-layer

Ensure that the init layer is removed with the container