OHAI-540 revisited

Commit 9f9045a has no effect on the version #, reverted in later commit.