When in Rome, do as the Romans do

Change-Id: I1529d035edb2f1453dc72a32df5c2750dc526672