Moved rebuild to update-and-propagate