A very old outstanding commit. Don't know what is it for :(