If we haven't eliminated it by the time we upgrade to write-to-jar, I'll go back and refine it