Revert to 1.6