Revert some changes introduced in 4f0feccb6f.