This reverts commit eb3e2f559f because of a suspected analyzer bug. Reverting to investigate.
eb3e2f559f