Issue #2803179 by Wim Leers, MKorostoff, Berdir, dawehner: [regression] rest_update_8201() can fail and break things (cherry picked from commit fabc088e)