Revert "Ensure that softloader can be flashed prior to, but along with either PIB and firmware or just PIB."

This reverts commit 14905f6228b3c7773e089af36ba810eb48d896a2.