Adding back some unneeded lines to reduce diff noise