Eliminate a now-unrequired hack.

This as a side-effect fixes RT#111734.