Fixing issue where original price was always sent if it was set, #554