Fix for CARBON-14486

Please review this and merge.