Reverse of ObjectService change
Merge pull request #1278 from Undercova/patch-2

Reverse of ObjectService change