For some reason, github displayed your comment to merge this without also displaying the two comments you made in here to fix the docblock and to move this code to the appropriate function.

Since I need to write a migration for this fix anyway, I'm going to just include these fixes in the PR for that.