revert some commit about retime in master