Cleanup for #1521