This reverts commit eec4bec761, reversing changes made to 64480e2fff.
eec4bec761
64480e2fff
<details>