Also change the call sites. *sigh*