This reverts commit 6d576a16a6412c7e7a8d9332fc85054954376d31, reversing changes made to 7766c16ed94dc4b18996b52c8c8606b143233bbf.