Clean up after merge of PR #104