revert some commit about retime in master, part5