Fix bad merge.

I screwed up during the "merge" portion of the rebase of the profile API. This fixes. Lets make sure Travis likes this.

r?