Fix over-eager dependency on container-api