reverting some questionable changes