JasonGross Partial work towards compat with trunk without -compat 8.4