Reverting part of the fix for bug #35127 as it isn't necessary and fails with indexed properties
Changed paths: