Oops, 037a142475a9834ca6c3c03332919acdd6aae3f7 was broken.  Messy fix.