This reverts commit 6df0b10df6. This change was originally merged as PR #352298 but it got moved to staging here.
6df0b10df6