Fixing CARBON-14887.