Revert "Revert "build only no otr""

This reverts commit 9684d4645c4f8350066232e4d5f4f0a6d8173061.