Revert changes from the nested lambdas commit till i figure out
why the buildbots are failing.