Re apply 7fdbf, which was accidentally merged out