revert libetpan changes