This reverts commit 9744c81ef58d3d81215a2a70a3daab79b021b9e6, reversing changes made to eeee4f50b36a14a5a11b1204b031909ded3a9918.