uh... I just realized, we should have another diff ready for merging in client at the same time we do this.