Revert "extdata_tool bug fixes"

This reverts commit 7df5f660efda0ee78a015962f0692535d3e52dbb.