Adjust/revert some changes re OOIION-1495.

This is mainly while a more careful review by Maurice/Carlos/Edward is done.  Several "TODO(OOIION-1495)" items added facilitate the review.
Merge pull request #1615 from carueda/OOIION-1495_rebase2

Adjust/revert some changes re OOIION-1495.
Looks good to EH.
Relevant test noted above.