Revert 325afae..5c317b4

This rolls back to commit 325afae2bc17ec5bbe309703e456aafd75e26162.
Adding Heap analytics