Matt, we can't do it now, unless we keep a compat module in until we have migrated all clients to use the new pkg. 
I rather do that in a separate PR.
Fergus, yes.