This reverts commit cf56618636a6e3bd1719f9291e25842a8eb1aa02, reversing changes made to fecd65b53417a6337e9eed44aa6f3279aa56e096.