Reverted propertyfile loader update
Backed out property file loader