Revert r83647, was based on the inability to read the function signature