Oops, forgot to fix up merge conflicts.