This reverts commit 5c5876e3f95662ec320af0ada34f0debfec4726b.