revert one of the perlcritic related fixes as this broke some tests