Cleanup for #1762