Fix Regression in FileSystem Platform 13.1 upgrade