Migration: Revert dumping custom vars as macros.

Refs #5364