A better fix for the USERFUNC collision (|amethyst).

This reverts commit fc2c4b98ea45921a4c1a996b7f2a48a4f76a9db6.