I'm running into the same exact issue in my code base as well