Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.