035b3eaff7
Retry of D848605 which doesn't segfault the open-source build. Formerly, this change caused the assembler to emit an opsize prefix before ret instructions taking a 16-bit immediate, which worked on our machines but caused problems for Travis CI.