BAMPFA-23: Temporary fix for CSPACE-6234.