This reverts commit 61515b30cc0bf17cea99253020d65b1d2568cd86.