Revert hack due to functions disappear from goto list