Let's just get this taken out now. It seems like it should be an easy swap.