Remove this line, and the comment above? Also OK if in a separate PR later.