This reverts commit 9f27f453. Supposed to be NFC, but broke buildbots (test addrspacecast.ll is failing).