
Revert a8cc61efcfd583d7aaae0fc69f5a69ab7b29107e as Horizon has landed the bugfix upstraem and its now available in RDO. From source is not pulling master, so this isn't an issue there. Change-Id: I4acd76698102e2203ce3b70d9988ad3cb2c1c8c5 Closes-Bug: #1482894