Cleanup for #1905