Summary: This will address the longstanding concern in #417 Test Plan: No new tests Reviewers: juan, evan Reviewed By: juan, evan Maniphest Tasks: T7065 Differential Revision: https://phab.nylas.com/D3322