Like I mentioned, let's use the new API and avoid the monkey patches to make the old one work.