Drop 1.7 requirement