The commit 8372d505082aceb38417e0b561cd32f2e227597b has been reverted (eafeb8af34946306a7382fa3801cf6e39a1c7226) because it broke asan tests on green dragon buildbots. The underlying issue has been fixed in 4dd5c2bee366514cbc3fc4e6da46462bc11a0a3d.