Go back to protocol agnostic version