Re-apply r214881: Fix return sequence on armv4 thumb