This patch is based on BabyFace Roster.