reverting some changes which should not be in this merge