The commit 8372d505 has been reverted (eafeb8af) because it broke asan tests on green dragon buildbots. The underlying issue has been fixed in 4dd5c2be.