Revert incorrect hunk merged as part of b97ceb19d6be0d474bd4305de9b33e87391cd6eb