Downgrade from 1.6