revert a couple of lines to main slc6 branch