Update build, see b48c7928ecd0a63f1fa5d6cd97aaf21bab54f290