#964114 replace make output parsing with remake