More cleanup re: #7875784323252