Manual build of 2.0.0-p247, redux