Revert "Fix NPE originating in FactionAccountHolder"

This reverts commit c0a01cd1d0ee2ad33fa80d544ffe880ec10b98db.