Revert "Merge branch 'LocalData' into newDeveloper"

This reverts commit 2d7fa68237294233d4b1092474eae61b32403dfb, reversing
changes made to f201bfdb678d85f96d4b2657faa2f41680f29876.