Undoing some ugly changes