While I'm here remove comment about use_system_icu because it is already unbundled.
MFH: 2018Q2 (blanket)