Revert back to functions.