i wonder whether we shouldn't land something upstream to make it optional for now.