Broke on aarch64-linux. Reverting while I investigate. This reverts commit 5692ed0cce8c9506eef40ffe6ca2d9629956c51c.