Removed old change missed while merging to upstream