Make some conflicting change

This is another great change to pull, but unfortunately it is conflicting with the earlier change.