A previous change to help garbage collection was causing an NPE. It is unclear to me that the "fix" is actually necessary, so I am commenting it out now until we can investigate it further.