Revert "Update for OPENIDM-1289"

This reverts commit 018342eba418844386b8bd7fd0e2ebe149b0a120.