This reverts commit 91b4d450703bcc2de6dce22eb5fdecb5a843f92e, reversing changes made to c98901132595178b6261cbe2d51ab732dd77dac4.