Uneliminate logic that was not really obsolete.