This reverts commit a2e7f261. The original patch (31af18bc) will be reverted, so reverting this follow-up patch first.