Revert "Lazily fix aliasing"

This reverts commit f3569d2b27fcf7e0a91e66c472c962498079df95.