This reverts commit 180e3e11d1. Per internal discussions, this is a temporary revert, to investigate if this is causing a performance regression.
180e3e11d1