This reverts commit d1d36f7ad2. Reverting this patch to investigate linux bot failures + fix with author offline
d1d36f7ad2