Remove vestigial code that was removed in commit cdf679d0