Revert "Use a function_ref now that it works (r221753)."