Restore mis-merge from Code-Eli