Fixing bad merge - function name got changed, changing back