remove workaround to SL #4621; consolidation