Summary: Fixes T3477 Test Plan: Tests are forthcoming Reviewers: dillon, evan Reviewed By: evan Maniphest Tasks: T3477 Differential Revision: https://phab.nylas.com/D1990