Leave out 1.6 stuff until a stable release.