re-introducing changes after accidental regression