Revert "Options to disable building some parts if libetpan ("

This reverts commit 574557242efa085ec0efcaed62f04b3c99b05b2b.

Remove extra commit