Sync to master: removed the 'rebuild' mode, this is no longer supported.