diff --git a/oni-company.el b/oni-company.el
index f03e9c1..90498a0 100644
--- a/oni-company.el
+++ b/oni-company.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190306002753
-;; Package-Requires: (company diminish oni-fci)
+;; Version: 20190522205448
+;; Package-Requires: (company company-posframe diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,27 +28,8 @@
 
 (require 'company)
 (require 'company-dabbrev)
+(require 'company-posframe)
 (require 'diminish)
-(require 'fill-column-indicator)
-
-(defvar-local oni-company-init--fci-used nil
-  "Buffer-local indicator used to remember the state of `fci-mode'.
-When `oni-company-init--hide-fill-column-indicator' actually
-hides the fill column indicator this variable will be set to t.
-`oni-company-init--show-fill-column-indicator' will only actually
-show the fill column indicator if this variable is t.")
-
-(defun oni-company-init--hide-fill-column-indicator (_)
-  "Hide the fill column indicator if `fci-mode' is on."
-  (when fci-mode
-    (setq oni-company-init--fci-used t)
-    (turn-off-fci-mode)))
-
-(defun oni-company-init--show-fill-column-indicator (_)
-  "Show the fill column indicator if `oni-company-init--fci-used' is t."
-  (when oni-company-init--fci-used
-    (setq oni-company-init--fci-used nil)
-    (turn-on-fci-mode)))
 
 (diminish 'company-mode)
 
@@ -61,16 +42,7 @@ show the fill column indicator if this variable is t.")
         company-echo-metadata-frontend
         company-preview-frontend))
 
-;; Turn the fill column indicator off when the company mode pop-up appears.
-(add-hook 'company-completion-started-hook
-          'oni-company-init--hide-fill-column-indicator)
-
-;; Turn the fill column indicator on when the company-mode pop-up disappears
-;; (either because it is finished or because it was cancelled).
-(add-hook 'company-completion-finished-hook
-          'oni-company-init--show-fill-column-indicator)
-(add-hook 'company-completion-cancelled-hook
-          'oni-company-init--show-fill-column-indicator)
+(company-posframe-mode)
 
 ;;;###autoload(with-eval-after-load 'company (require 'oni-company))