Reconcile props with Muppets for sirius/shinano

I am not sure were the taint has come in... but hopefully this will fix it

Change-Id: Iab68b6234e1154e55fa4a686f4bac2e7e501dea2