Revert f04f82f..51de328

This rolls back to commit f04f82f2e9548ccbd8c1c8f6aa2f7816d472ae35.
Adding Heap analytics