Imported anew (could not figure out how to "undelete" from mistaken prior commit cleanly)