I'm guessing that we can get away without the re-export. If someone complains we can add it.