Towards Idempotent Rebuilds?