Not sure what I was thinking when initially implementing this... Change-Id: Ib82f0f5a86683c08823dd4b59c98259d27151822