Yet Another (manual) merge fix.