Reverted changeset r1631 on trunk (cruft).