Cleanup for #1632