Revert "Merge pull request #92 from rajvikram/OOIION-1482-1490_rebase2"

This reverts commit e732f2af384382978c09c4806a19f1efa0174f6f, reversing
changes made to 07eab6ddb112d52c0b94024a94b8299967f6038b.