whoops, buggy code got accidentally commited.  reverting back to known good but keeping the via changes.