Revert d927eac..0a4ba24

This rolls back to commit d927eac116c939cf58cf8539221575c562de76b3.
recover libetpan update and modify