Sync to reorg. Fixes compilation.