revert previous commit, move fix to -emit-value :map