This reverts commit 3c6c420aa750029742c86dd6d55f2bbf79db75e1.