Recreate commit 73bacd79474d0f0d947f570f2c486ea36e18dd38 undone by mistake during merge.