Revert d97983d..e2ab41a

This rolls back to commit d97983dca82a9f53754ed07930e21f554cf4edc8.
Local DB
Revert 8ee8937..9c01025

This rolls back to commit 8ee893719472e7ef347d146c12f45f829520cccd.