This reverts commit f0fe4612fa78e1d43b024500595e0efded73cfcb, reversing changes made to 5da51b1995d06466d2a6a83dc1b14e33c5ef17e8.