Switched back to the old function