(cherry picked from commitecc06cbc32) Backported from master to not include the config option. (cherry picked from commit1780ade486)
(cherry picked from commitecc06cbc32) Backported from master to not include the config option. (cherry picked from commit1780ade486)