Hacks to get command line tools working after our hacks