for some some reason, we need this despite it being the default. (cherry picked from commit 0fc095c4)