AS-6583 this caused significant performance regression