Back to 1.6.4 snapshots