I don't understand this removal. Looks like it might break things.