This reverts commit 2b84b78481055c26dd7349c785133fc7fba69931.