Revert "Fix promise tracker after upgrading"

This reverts commit 59f77e7293ffddc7b9aaf72d9fd4caefdd9e5315.