I think for now we should just leave this as-is, though we'll need to come up with a better way to handle this in the future. @joey711 can you create an issue for this on the issue tracker so that we don't forget?