Only rebuild on the first pass of creation