This reverts commit 7db82bf716f1c89fd707abab1db875c6de688dca.