Reverted OSClass changes

Reverting OSClass changes