Revert an accidental reversal of a docstring when we were resolving merge conflicts