Resolve #3585263 "Unable to save"

Alex Pottrequested to merge
issue/node_revision_delete-3585263:3585263-unable-to-save into 2.1.x

Closes #3585263

Merge request reports