Revert "[568627] IllegalStateException: Different object was registered for OIDnnnn"

This reverts commit c89fadae17494ed62e438dd2ce3887fb3d2040c6.
3 files changed