remove hack2 from xreplace
Merge pull request #2097 from smichr/xreplace

remove hack2 from xreplace