This reverts commit 2bf7f14f9d050c58f141f465633bb6e274b903dd, reversing changes made to 989240812532ca43a52513339f4dda8f44a80a64.