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