This reverts commit 23de2edd5619e3a2b59be93699e1b2fe6e5982d5.