This reverts commit 046deabd93aca70b508784bdd91f62305ced81e3 since it broke libc-aarch64-ubuntu-fullbuild-dbg.