Undoing sonar false positive warning suppression attempts, they didnt
work.