Revert
r105140 temporarily. The exception is thrown while running the parser tests (at least from Jenkins, haven't tried locally), which completely breaks the test suite and renders Jenkins useless. Feel free to reapply once the cause of the oi_archive_name bug is fixed and committing this won't cause exceptions to be thrown in Jenkins's face.