unwinding my changes, as they seem to have cascading negative affect