Rebased to master, undoing changes related to CRA auth