forgotten part of previous commit

Change-Id: If050e630edacef67ab194c0b6941a6542e4ebceb