Swift busted with Heka
Swift busted with Heka

Swift and heka were broken by an optimization that resulted in
a regression in commit:
0a1486a2c73275009f7158c911e7bfd683e40a58

This patch fixes that problem.

Change-Id: I02c6cf4de4f807c3ec66e2d4f59f182d0b864ea3
Closes-Bug: #1560788
(cherry picked from commit 8307b06a46b77f8b57a65b2eb74d797e5b794ca6)

negronjl/kolla,negronjl/kolla,negronjl/kolla