Remove an ugly Ultrix hack. Ultrix has been AWOL since the last ice age, more to come.
MFC after: 1 week