Revert the version of the toolkit, plus a bit

b549e37 updated it a recent version. 5424d51 accidentally undid that.

This change reverts 5424d51, plus goes all the way to bleeding edge
since we should try to dogfood as much as possible.