Revert changing the OID numbers
Merge pull request #12 from Metaswitch/sto640

[No Reviewer] Revert changing the OID numbers