reinstate a workaround about cleaning up btrfs subvolumes; most likely that was still...