Re-rolled dfp #2059597 for our older patched version of dfp