[PATCH 21.4, 21.5] fix revert-without-query