Rollback release:prepare commit for 1.6 release