This change is still coming, right?