Revert d671c8f26dbfd4a15a00194a7d96a89c41bc3782 commit.