fix build server. re #8709