Using the latest commit to the 17.6.x branch, just to play around with
it.  Hopefully it won't have too many bugs.