Follow-up to commit 74e9e1d82a09b5255d2dd326387ac624ac1ba447 Change-Id: I60f7ee85ee7ead430dfe216bfea5392355098bd2