Rebuild per `02d6b36f1f5d67b355bb539dea530d289be3bfcf`