Rolling this back too.
DFP conflict fix.
Basic search header.
New search template.