Revised strategy to work with new seesaw auth stuff