This reverts commit 8c6c49f2. As discussed offline, this patch breaks internal builds and tests so I'm reverting it for now.