try to fix build
Revert "try to fix build"

This reverts commit 6dcf7a5531eb1085e174f96b164341f2d983c71f.
remove unneeded lines for omniplus
Revert "remove unneeded lines for omniplus"

This reverts commit 1e9fbc0b4e1b86fe144ca1dc5de322545b242954.