Trump Drops Plan to Tax Ships but Will Restore Blockade in Strait