Cleanup for #1928