Sorry for the late feedback, I've been on PTO. (-:

Can we use the get(key, fallback) function on the "platform" capability too, to alternate between the two?  Wouldn't that save us from having to roll back the patch in bug 959186?