Ensure we build with 1.6 and use the 1.5.8 release.