no idea how this got so broken.  I blame git merge hell.