SWC-1528: remove unnecessary calls to revalidate