Revert part of applink/Borland commit