This reverts commit 39767afab9011d56b8fd90de508cb62a00bf9dd8, reversing changes made to 40f5298a3bf9d6755fe0adaff8d9e7a38861da59.