Rollback commits for 1.6 release