More work on object.txt

Will revert when updated upstream.
Revert "More work on object.txt"

This reverts commit eedeb7db93d1f20c3a8cc5003fd3cf7b7a644668.