Revert changes to oae-principals after splitting todo out into its own module