Update build, see 8d1e564d1c60aaa3b72d629df617c1854a9fbde4