implement containerless with the real Metamorph mixin

The previous hack doesn't work.