This reverts commit 2585c8b66a454252b0cf265d62f76c33839f6f2c, reversing changes made to 8e012ebbb22b0468d746e31ad33463a71f0ef595.