Fixed just enough of this disaster to get it to work on 14.9.