Revert "Date and Merch eVar"

This reverts commit 1d350c1d6c5cb1c2e432a05d79edcd80ec847cbb.
re-fixed items after rollback

The rollback destroyed some of my fixes, like the order review page not
firing and the zero search results.