Force rebuild.
Merge pull request #5793 from ktf/force-rebuild

Force rebuild.