Fix Malahal Naineni commit 2b68b83 review highlights