Reverting r220517; it seems this broke check-asan.