OHAI-540 revisited

Version # change in 9f9045a was reverted in later commit.