Revert "Integrate ViewServer"

This reverts commit 57a866c7a933defcbee05cc2531f4ee5b52aaa03.