ENYO-3082: Revert "ENYO-3082: upgrade onyx to 2.3.0-rc.2++. Removed compatibility code."

This reverts commit 7f0a8e24663d7b1284db6376c348b2b6d4ef4a7b.