This reverts commit 6c12901eb4 (PR #326371), reversing changes made to b0407f152a.
6c12901eb4
b0407f152a