Adapt to removal of EntityContent::save