Reverted commit e9c2e060d305dc75cd5bc2855cd6807aac3b7474.