Fix accidental revert in 0b7c5b710e98d85f41ef6fae20e61049acac0b70