Revert a2aaab5..739d4e8

This rolls back to commit a2aaab52742ba6e701b9d293fd78a7e3323181f2.
Local Store