I just remembered this whole code block existed because we wanted to support Java 6, which we don't actually support any longer. So I am removing it, and the need to address this goes away.