Belated merge fix.