Revert back to 1.6
Give aliakhtar some credit