We need a clean solution for this, but that will need a bit more
effort & thinking.

Change-Id: I I25d066fa0322cca9a15af1745a758b1aba981e13