This reverts commit f1a6267c9742038bb4a771d350291999c3d8431c, reversing changes made to 2b24b5eaa28735053823b210618318cbbe2afa56.