diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index be9ca3889..a9ce6fef0 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -1,7 +1,7 @@
 # Yay! High voltage and arrows!
 
 prompt_setup_pygmalion(){
-  setopt localoptions extendedglob
+  setopt localoptions nopromptsubst extendedglob
 
   ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
   ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
@@ -10,22 +10,6 @@ prompt_setup_pygmalion(){
 
   base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
   post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  '
-
-  base_prompt_nocolor=${base_prompt//\%\{[^\}]##\}}
-  post_prompt_nocolor=${post_prompt//\%\{[^\}]##\}}
-
-  autoload -U add-zsh-hook
-  add-zsh-hook precmd prompt_pygmalion_precmd
-}
-
-prompt_pygmalion_precmd(){
-  setopt localoptions nopromptsubst extendedglob
-
-  local gitinfo=$(git_prompt_info)
-  local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
-  local exp_nocolor="$(print -P \"${base_prompt_nocolor}${gitinfo_nocolor}${post_prompt_nocolor}\")"
-  local prompt_length=${#exp_nocolor}
-
   PROMPT="${base_prompt}\$(git_prompt_info)${post_prompt}"
 }