GPII-209: removing demands from universal.