Re-instate "Remove pre-authmanager code"

Authored by Reedy on Thu, Oct 12, 1:51 PM.

Description

Re-instate "Remove pre-authmanager code"

This reverts commit ecf9bc4424595d2d8e038c57fe8402a2bc20e7f7.

Fixes copy paste fail from Id686d75e0a6b475a79f7f715791d867dc6fb400c,
should've been preauth, not primary

Change-Id: I8c5456af1ca3bf89c4fd1791b113ac3a16350989