[#894714] No longer clean up empty layers at all.