This reverts commit c0942cbbe67158c68ecfd9bf4cb7bdea84e0d529, reversing changes made to a370461f3420ec285838126da7e7efd6a3101640.