Revert "orca tools string fixes"

This reverts commit 3a812406e6cbc824731e977449b694b19721451e.