Remove change made in d19b672a3c06f0ae95b1da38b63b068f71eb266f until we can
remember why this change was made.