Commit not ready. Sorry.

Revert "Fixing an evar_map bug revealed by commit 603b66f81 on unification flags."

This reverts commit d083200ae5b391ceffaa0329a8e3a334036c7968.