Revert some of the automatic SF reconfiguration

Change-Id: I942379b620db6b6ea45e66102f2964338cf4448e
2 files changed