This reverts commit e10de1b831affae2d113e39424f74a31ea94d3d0 so that the PR is a lot more simple with less to review and only focuses on just updating to webapi 2