Revert the last two patches to go back to a state before this file was
controversial.
1 file changed