bit of de-linting via diff from official source