hackish first pass update to 1.8