Make check less work again

Follow up to Iedb8dc31e4817d8b4e40b655cf9b8fb092979e90

Change-Id: I7134f8714234835c23c35860c77179c3a69244cf
Merge "Make check less work again"