Also revert this patch until Ismail can re-land. This reverts commit febb4c42b192ed7c88c17f91cb903a59acf20baf.