Revert changes introduced in 4f9f8dae3.