Fix bug where $Forwarded flag was being set even if server didn't support it (#1490000)