I wonder if this code is old enough now that we can remove it while we're in the neighbourhood.