Rebuild after EZP-23276 implementation