This reverts commit 6a632deaade904b159bb232921346cc60fe2c9c6, reversing changes made to 8de4deae26dfaf0e1e4695e0caedf8feee29e126.