Revert "Merge branch 'bytegator-fix' into develop"

This reverts commit 0e7eadafe0057ab99163a0709b9497ea20d16dce, reversing
changes made to bccac1a86185d07b80555241fa5b14290094ce6e.
Merge branch 'Sync-with-osclass-osclass' into develop