Reverted 028f8a0fc2c1d80e38ee11a62ef9783fe1234256.

Symbol name conflicts between Xt and Xaw make it impossible to build some Xaw-based code.