This reverts commit 6f60262d21.
Co-authored-by: Kai Guo <kaigu@microsoft.com> Co-authored-by: Jamon Holmgren <jamonholmgren@gmail.com>