Ditch custom implementation for core-object.