This was accidentally reintroduced after a merge conflict. Change-Id: Ibae58aae1520d8f934b59eb9dae6979d95a0a312