This reverts commit 566a6fc59fba3bf4150c1375552883c95641f7cd, reversing changes made to 594356189a4db2e2529cda8c79a47705b04246c4.