Remove workaround for bug #1219530

Bug #1219530 has been fixed before Havana. We can remove this workaround.

Closes-Bug: #1307472
Change-Id: Ib0b1abf7d11627045be922f79aff6b80448ccbf4
Merge "Remove workaround for bug #1219530"