Revert "Revert "rebuild""

This reverts commit 188359214971787c48f7d2ad10b0f7f6a29a5900.