Revert "Hlint cleanup"

This reverts commit f984da89807db1196b591a0ac37e675d767b07ce.