Revert "build only no otr"

This reverts commit 0d7c69830316f2f8fa28c25aed49b614a133b1ae.