This reverts commit 8391aba306cfbad605ef83d8278fcfdb8a345a87, reversing changes made to 7daac4ab3a779451831f7895bdfa57806e1f1e36.