attempt 3: avoid merge conflict with H-8849