We have this information now so let's just use it. Change-Id: I89ee1b88e89c23e9f6aeaa9547e7afc80816a2a8