This reverts commit 69124f104991e36e254c0be4a5f8155609f1d3fe.