This reverts commit 1ee5b0616175acbb04bf1640eb085eee60981309, reversing changes made to 9cb30b5be6d98e73022f940463c62e66e088db11.