This reverts commit bbac04a733d6b7c05442d7ea2354cc594a775f83.