Breaks assembler_thumb_test. This reverts commit d494c5e3. Change-Id: I0ccac4c7bf391185b860767bd26d48189bfae461