This reverts commit 2f0a4c71.
It seems the commit was accidentally added when 768e24af was manually merged and pushed.