diff --git a/src/Journal.tsx b/src/Journal.tsx
index cef401b..fdecf3f 100644
--- a/src/Journal.tsx
+++ b/src/Journal.tsx
@@ -10,6 +10,8 @@ import JournalAddressBook from './JournalAddressBook';
 import JournalCalendar from './JournalCalendar';
 import LoadingIndicator from './LoadingIndicator';
 
+import { syncEntriesToItemMap } from './journal-processors';
+
 import { store, StoreState, JournalsData, EntriesType, CredentialsData, fetchEntries } from './store';
 
 interface PropsType {
@@ -71,7 +73,7 @@ class Journal extends React.Component {
       itemsView = <JournalCalendar journal={journal} entries={syncEntries} />;
       itemsTitle = 'Events';
     } else if (collectionInfo.type === 'ADDRESS_BOOK') {
-      itemsView = <JournalAddressBook journal={journal} entries={syncEntries} />;
+      itemsView = <JournalAddressBook journal={journal} entries={syncEntriesToItemMap(syncEntries)} />;
       itemsTitle = 'Contacts';
     } else {
       itemsView = <div>Unsupported type</div>;
diff --git a/src/JournalAddressBook.tsx b/src/JournalAddressBook.tsx
index 160b59c..43bf5c3 100644
--- a/src/JournalAddressBook.tsx
+++ b/src/JournalAddressBook.tsx
@@ -5,8 +5,6 @@ import * as ICAL from 'ical.js';
 
 import * as EteSync from './api/EteSync';
 
-import { syncEntryToEntriesProps } from './journal-processors';
-
 import { routeResolver } from './App';
 
 import AddressBook from './AddressBook';
@@ -65,4 +63,4 @@ class JournalAddressBook extends React.Component {
   }
 }
 
-export default syncEntryToEntriesProps(withRouter(JournalAddressBook));
+export default withRouter(JournalAddressBook);
diff --git a/src/journal-processors.tsx b/src/journal-processors.tsx
index c8da9fb..8c054d8 100644
--- a/src/journal-processors.tsx
+++ b/src/journal-processors.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import * as ICAL from 'ical.js';
 
 import * as EteSync from './api/EteSync';
@@ -22,21 +20,3 @@ export function syncEntriesToItemMap(entries: EteSync.SyncEntry[]) {
 
   return items;
 }
-
-// FIXME: Figure out how to correctly use the props type
-export function syncEntryToEntriesProps(WrappedComponent: any) {
-  return class extends React.Component {
-    props: any;
-
-    render() {
-      let items = syncEntriesToItemMap(this.props.entries);
-
-      return (
-        <WrappedComponent
-          {...this.props}
-          entries={items}
-        />
-      );
-    }
-  };
-}