This reverts commit 8f507dcc9fbcd51072047c82a443137aaac0f377, reversing changes made to 70abd7a155b396e3b44ce21ff8d36be6ad03a060.