A cleanup for #1270