follow up to c2aeac14c7