Reverting 1.7 switch