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