reverting previous changes as they were not needed