#86615 persistent removal of public layers