Revert layers.xsd fix to reduce risk of a regression since it has not yet made it into a 2.5 release. This reverts commitf185b0767a, reversing changes made tobf3c6dfdba. See gh-31126
Revert layers.xsd fix to reduce risk of a regression since it has not yet made it into a 2.5 release. This reverts commitf185b0767a, reversing changes made tobf3c6dfdba. See gh-31126