Bring inline with Muppets

Change-Id: Id3a7fd6bcd66049d883eae493b5663311851dadb