Revert "HPON setup"

This reverts commit bf9c676f71dbfd9a6f5d2c8ae675e317dc79c9df.
Revert "Revert "HPON setup""

This reverts commit 1d2bf2236ad1e762fe2715172ebe0280e81ba6f1.