This reverts commit 7ff78e35, reversing changes made to 638e1f8f.
This reverts commit 8f4370cd.
This reverts commit 6a609625.