Restoring / cleanup now that there's a trinket branch.