Continued cleanup of dac40105e6a36923076cc7e8a636c92dc2cca26c [14739912]