rollback to Kuan latest commits

rollback