Are we totally removing this? If so, is that a change to add to a point release such as 1.7.2?