Cleanup for #1931