Lint fix, and undo accidental unrelated change