Probably eventually.  This is how it was and I'm inclined to leave it as it until the next phase of changes.