ref #4167 - make it lint-clean