Issue #2640496 by Berdir, catch, amateescu: Revision ID in {node} and {node_revision} can get out of sync
