RFC: revert to external snapshot API