Re-add a wrongly reverted commit.