This was messing up the control flow graph



Former-commit-id: 7a6c7d0c2104d2e46a1d9841caf533e74d33c1f2