This reverts commit 96fd8fbca6d4cf32a4a3e1873be3a85f27699d19, reversing changes made to 4e0dd619b6b771a9fe39c32a409c91bbd7da4829.