This reverts commit 96530cc00a752953678e91d2dee25046912db20c, reversing changes made to 693163c5417fe0d13dde2d6dfe0876c77939eb96.