okay, util it is. Will only change the 2 places that we care to strip out the tenantId. 
Thanks to Simon Toens who validated a "wierdness" I was seeing and gave me the code to test this. Our tests in core app were failing,