Summary: Resolves T1984 fixes T1984 closes T1984 Test Plan: Run two new test cases Reviewers: evan Reviewed By: evan Maniphest Tasks: T1984 Differential Revision: https://phab.nylas.com/D1654