Rebuild for not relying on timer.