Fix inability to totally override content model.