Revert "Merge pull request #1593 from rhelmer/bug928145-reland-JSON-stac...

...kwalker-changes"

This reverts commit fdd31f7d4531a6032a292358e79f5d8d1b383092, reversing
changes made to 4ec56d22abe2e81577ecc70229e8a3bf231bfdb5.