Revert to cell ownership, but none for lower order entities