This reverts commit f776af2a1f. Fixes #9314
f776af2a1f
Fixes #9246
Add missing newlines at EOF. Remove redundant comment. Fix grammar in comment.