diff --git a/lib/ansible/executor/playbook_executor.py b/lib/ansible/executor/playbook_executor.py
index ac7103d540c..686da5c3219 100644
--- a/lib/ansible/executor/playbook_executor.py
+++ b/lib/ansible/executor/playbook_executor.py
@@ -33,6 +33,8 @@ from ansible.template import Templar
 
 from ansible.utils.color import colorize, hostcolor
 from ansible.utils.debug import debug
+from ansible.utils.encrypt import do_encrypt
+from ansible.utils.unicode import to_unicode
 
 class PlaybookExecutor:
 
@@ -261,7 +263,7 @@ class PlaybookExecutor:
                 second = do_prompt("confirm " + msg, private)
                 if result == second:
                     break
-                display("***** VALUES ENTERED DO NOT MATCH ****")
+                self._display.display("***** VALUES ENTERED DO NOT MATCH ****")
         else:
             result = do_prompt(msg, private)
 
@@ -269,13 +271,11 @@ class PlaybookExecutor:
         if not result and default is not None:
             result = default
 
-        # FIXME: make this work with vault or whatever this old method was
-        #if encrypt:
-        #    result = utils.do_encrypt(result, encrypt, salt_size, salt)
+        if encrypt:
+            result = do_encrypt(result, encrypt, salt_size, salt)
 
         # handle utf-8 chars
-        # FIXME: make this work
-        #result = to_unicode(result, errors='strict')
+        result = to_unicode(result, errors='strict')
         return result