Cleanup for #1525