diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 61f14d7..3e74568 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -104,9 +104,6 @@
       'flymake-allowed-file-name-masks  ; flymaking 'easy'.
       '("\\.go$" flymake-simple-make-init))))
 
-(eval-after-load "hippie-exp"
-  '(oni:load-hippie-exp 'yasnippet))
-
 (eval-after-load "ido"
   '(setq ido-ignore-buffers `(,@ido-ignore-buffers
                               "^\\*.*\\*$" "^irc\\." "^\\#")))
@@ -125,9 +122,6 @@
      (global-set-key (kbd "M-x") 'smex)
      (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)))
 
-(eval-after-load "yasnippet"
-  '(oni:load-hippie-exp 'hippie-exp))
-
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
 (put 'narrow-to-region 'disabled nil)
@@ -298,6 +292,7 @@
 (setq user-mail-address "tom@ryuslash.org")
 (setq w3m-fill-column 72)
 (setq window-combination-resize t)
+(setq yas-fallback-behavior nil)
 (setq yas-prompt-functions '(yas-ido-prompt))
 
 (add-hook 'after-change-major-mode-hook 'set-current-mode-icon)
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index f636587..8930d6d 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -287,13 +287,6 @@ If COUNT has been specified indent by that much, otherwise look at
       (kill-region (region-beginning) (region-end))
     (kill-line)))
 
-(defun oni:load-hippie-exp (other)
-  "Make sure both hippie-expand and yasnippet are loaded in order
-  to add yasnippet's expand function to hippie-expand."
-  (require other)
-  (add-to-list 'hippie-expand-try-functions-list
-               'yas/hippie-try-expand t))
-
 (defun oni:lua-mode-func()
   "Function for `lua-mode-hook'."
   (local-unset-key (kbd ")"))
@@ -626,7 +619,8 @@ for easy selection."
 (defun oni:yas-minor-mode-func ()
   "Function for `yas-minor-mode-hook'."
   (define-key yas-minor-mode-map (kbd "TAB") nil)
-  (define-key yas-minor-mode-map [(tab)] nil))
+  (define-key yas-minor-mode-map [(tab)] nil)
+  (define-key yas-minor-mode-map (kbd "C-\\") 'yas-expand))
 
 (define-skeleton html-tag
   "Testing creation of an html tag"