Update build, see f7523595aeca2c3822708b195bf071b94f432887