Revert commit 93204, since it causes the assembler to barf