Bad code landed, causing ubuntu to be always landed.

Change-Id: Ia77073563fde70140169dbbc5a7448aad54295e2